From 738f5f4523fcdaebe7dce23e12a90215c68bd290 Mon Sep 17 00:00:00 2001
From: nana-4 <hnmaigo@gmail.com>
Date: Tue, 25 Aug 2020 23:21:40 +0900
Subject: [PATCH] Adwaita: Fix border-spacing for headerbar

GtkHeaderBar uses GtkCenterBox internally nowadays, so the theme needs
to correspond to it.
---
 gtk/theme/Adwaita/_common.scss | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 1b03c4d16f..1d732c984f 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1408,11 +1408,6 @@ headerbar {
     transition: $backdrop_transition;
   }
 
-  box.start,
-  box.end {
-    border-spacing: 6px;
-  }
-
   .title {
     padding-left: 12px;
     padding-right: 12px;
@@ -1488,7 +1483,13 @@ headerbar {
 }
 
 headerbar {
-  border-spacing: 6px;
+  > windowhandle > box {
+    &,
+    > box.start,
+    > box.end {
+      border-spacing: 6px;
+    }
+  }
 
   // add vertical margins to common widget on the headerbar to avoid them spanning the whole height
   entry,
-- 
2.30.2